Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Sun, 17 May 2020 21:49:02 +0000 (22:49 +0100)

committer Andrea Corallo <akrl@sdf.org>

Sun, 17 May 2020 21:49:02 +0000 (22:49 +0100)
author Andrea Corallo <akrl@sdf.org>
Sun, 17 May 2020 21:49:02 +0000 (22:49 +0100)
committer Andrea Corallo <akrl@sdf.org>
Sun, 17 May 2020 21:49:02 +0000 (22:49 +0100)
diff --cc src/alloc.c
Simple merge
diff --cc src/lisp.h
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Sun, 17 May 2020 21:49:02 +0000 (22:49 +0100)
committer	Andrea Corallo <akrl@sdf.org>
	Sun, 17 May 2020 21:49:02 +0000 (22:49 +0100)
		1	2
src/alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history